apalis/colibri_imx6/imx6ull: make sure loadaddr does not collide

Currently $loadaddr and $fdt_addr_r point to the same address. This
might be not ideal for some distro boot scripts which make use of
$loadaddr after loading the device tree.

Make sure the two variables point to two different addresses. Moving
$loadaddr is not entirly trivial since it is defined in mx6_common.h.
Move $fdt_addr_r and $ramdisk_addr_r by 1MiB, which should be enough
for scripts.

Signed-off-by: Stefan Agner <[email protected]>
Acked-by: Marcel Ziswiler <[email protected]>
Reviewed-by: Igor Opaniuk <[email protected]>

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 96169f55f08c6f7d87f69a5c98a26fd5e8c4bc96..91054d8c05b24990231d9628c584b67f6195d8fc 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -138,12 +138,12 @@
 
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x20000000\0" \
-       "fdt_addr_r=0x12000000\0" \
+       "fdt_addr_r=0x12100000\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "kernel_addr_r=0x11000000\0" \
        "pxefile_addr_r=0x17100000\0" \
-       "ramdisk_addr_r=0x12100000\0" \
+       "ramdisk_addr_r=0x12200000\0" \
        "scriptaddr=0x17000000\0"
 
 #define NFS_BOOTCMD \

diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 7cf550cf9ebbd5e92bb69fb834c6cf9323440f64..31248b14a10fd6f8166ee8bdf0ddc11d48546089 100644 (file)
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -48,12 +48,12 @@
 
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x10000000\0" \
-       "fdt_addr_r=0x82000000\0" \
+       "fdt_addr_r=0x82100000\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "kernel_addr_r=0x81000000\0" \
        "pxefile_addr_r=0x87100000\0" \
-       "ramdisk_addr_r=0x82100000\0" \
+       "ramdisk_addr_r=0x82200000\0" \
        "scriptaddr=0x87000000\0"
 
 #define NFS_BOOTCMD \

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 803c9be0646b5854c40cfd9e26e605982cb25efe..fecea95d32b5a49d0756922419d770ad3c16ee0c 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -128,12 +128,12 @@
 
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x10000000\0" \
-       "fdt_addr_r=0x12000000\0" \
+       "fdt_addr_r=0x12100000\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "kernel_addr_r=0x11000000\0" \
        "pxefile_addr_r=0x17100000\0" \
-       "ramdisk_addr_r=0x12100000\0" \
+       "ramdisk_addr_r=0x12200000\0" \
        "scriptaddr=0x17000000\0"
 
 #define NFS_BOOTCMD \